Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Mon, 10 Apr 2006 15:36:03 +0000 (16:36 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Mon, 10 Apr 2006 15:36:03 +0000 (16:36 +0100)

Trivial merge